Stefan,
thanks for the feedback, this is very valuable! :)

Moving the code to a different place would be okay to me of course.
As for being tied to "keyword" and certain HTML versions,
I suggest that we open up new issues. Otherwise this one will
get to cluttered. Would this be okay for you?

Rationale:
This is a large feature to be done in its full entity
and to me it turned out that we need to tackle it in steps
which are itself usable. I believe we have completed
a good and important step in this direction.
The restrictions towards "keyword" and html versions are there,
but were done deliberately to reach a useful step early
and not get stuck.
Maybe we could rename this issue to be more specific if this helps
to make it one step. 

What do you think?
Bernhard