Cleanup
This is a set of clean-up changes extracted from the !22 (closed) which are totally unrelated to any changes in pybind11.
This is a set of clean-up changes extracted from the !22 (closed) which are totally unrelated to any changes in pybind11.