Fixes #1063 (null-span marking whole word)