Cleanup core.cli a bit