Less code duplication in templates.
Reification fixes. The topic map can now be reified.