r189218 - Simplify now that -O4 just maps to -O3 and -O is an alias of -O2.

[Rafael Espíndola]

> I find that a bit surprising, given that -O should mean -O1.
> Daniel -- you changed it to mean -O2 in r82131. Any idea why?

Ping.

Cheers,
Rafael