Use 'o' consistently in fixup_options()