Merge "Ensure consistency around ignorable codepoints"