Some minor cleaning up [ci skip].
Some improvements to some of our editing plugins.