Use C++ native conversions rather than simplistic, homemade conversion selection.
Reorganization.