unicode: Fixed combining for real. Bleh.