Small cleanup for HAVE_COMMAND.