Readability tweaks relating to commands.