Removing zero-width space hackery