I think we should just fix WordUnderCursor so this is not required. It should work regardless of the position of the cursor within the word.