De-static-ify the CLI