c++/units: attempt to fix symbol map errors