Bugfixes and stylefixes in `clap/builder.py`