Switch to using new cmdliner boilerplate