Use CONFIG_* macros in cmdutils.c for consistency.