More clean-up of applying operations