Clean up animationplayer API a bit