No more need of command-internal.h