Cleanup 'thing-at-point' integration