...which it did unlike all the other implbaseN.hxx.  Required lots of downstream clean-up,
of course.

Change-Id: Ib720e7a0a43410dcd7e6338b84a3973dfbb20866