Filter styles and add cleaner backwards compat. Closes #3165