tweak decode handling for python2 u -> u cases