* epunt_cxx called unnecessarily (no C++ checks to punt).
fixed in all the version we'll be moving forward with.