Refactoring: nothing should depend on commandline package. Found cause of #159 .