Tweaked command semantics a little.