This patch consolidates several aspects of the command handling in