_markupsafe: remove some py2.4/2.5 compat code
utils: remove some old py compat code