Fix the `Runner` and `CommandLine`.