Change around compile options.

No significant changes.