Fixing power optimizations (and style).