Drop some 2.6 workaround.

Drop a few remaining 2.6 hacks, and see if test pass :-)