Simplify optional usage in Animation switch