Statically enforce Editor invariant + cleanup