Refactor (breaking) for animation hooks.