Fix normalize() to remove spaces before Thai tone marks and non-base characters (conservative approach)

Fix normalize() to remove spaces before Thai tone marks and non-base characters (conservative approach) #2377