These "internal" commands should all be moved to a new group at the end (with an appropriate comment).