More effect optimizations