Further improvement, cursor position for $0 to fix an annoying whitespace problem