Drop some 2.6 workaround.

Drop a few remaining 2.6 hacks, and see if test pass :-) 
You've left the branch for 2.6 and older here, instead of the one for 2.7 and newer.