Move some aliases out into commands