don't allow aliases to share names with plugin commands, + general cleanup