Some simplifications to the animation code - potentially a little slower
but didn't have a noticable effect on obiwan.