Transition - Cleanup

Code cleanup to make it easier to make new types of transitions (other
than the screen edge push).