Fix ANIMATED and SWITCHES output.