Fix spurious space disappearing autocompletion issues