Improve handling of strings like 'ye', 'y' and ' '.