Pass the object, to make it available to theming.

Needed also to do highlighting...