Function to act on thing-at-point improved.

Still not satisfying.