Re-add some of the specs for aliased commands, with some minor fixes