Update CLI tools to use new form of specs for args