Fix behaviour that operates on a non-empty TreeMap for AnnotateCommands,
fix at source of problem (EditPolicy)