Simplify make-optimized further.