Fix strange logic with UOE and abstract methods, as hierarchy is otherwise hard to understand. TODO: indent is sometimes 4