Remove unnecessary invalidations when setting specific options