Merge pull request #2098 from Hixie/animation-cleanup

Some trivial animation library cleanup.