Further rewrites to base style