don't mask class template parm
simple warnings cleanups