Editor: More editor cleanup.