Tweak Shader, preparatory to fixing the unicode_literals issue.