No more command.h and command-internals.h