Make a couple more interactive commands autoloaded

Generally speaking, all interactive commands that are usable on their
own should be autoloaded.