Use different optimiser and some clean-ups.