Various fixes

Don't pass in the shell name. The usage message is fine being "Exit the shell". Commands shouldn't be setting any shell-specific attributes.