Move replace-commands to commands.replace-commands