handle some more style rewrites