Making -O and -f modus operandi semantically consistent.