Editor: Yet more simplifications to controls behaviour.