Finished adding all the dual-usage commands.