modal: Get rid of animation modifier

..with additional tiny refactoring