still more cleanup in transitions/0.23