Cleanup usage of waiting and non-waiting EDITORs