Tidy up CLI library.