Cosmetic.
Refactoring. Don't let ICU set any optimizaton flags, that's for us to
do.