CORE-4073: Minor changes to reduce extraneous editor flushes.
Also improved integrity of newly create arguments.