Remove debugging code; rename in preparation for UTF-16-BE patches.