Roll the empty/grab commands into the rm/get commands.