Fix unary / optimizations.