tweak optimizer pipeline, fix for where commutation/association rewrites are allowed