Added even more no-OPTION overrides.