merging toby-unicode-size-branch, a fix for a regression introduced by TaintedString changes, reported as collector #565