Combined and simplified two ApplyAnimation fixes.