Split the optimizer up. Remove the dreaded 'goto' from which doesn't need it.
Minor grammar fix.