Drop some 2.6 workaround.

Drop a few remaining 2.6 hacks, and see if test pass :-) 
Ok, I was definitively tired when I did these 2 PRs. Thanks !