Fix recent encoding breakage on trunk.