Simplified default_editor implementation

Added a short-circuit which led to a simpler implementation. Style preferences may vary here.