Little CLI refactoring, and switch BBB init questions to the new CLI interface