Swap empty command logic to be easier to grok