Support terms as identifiers in URIs.
Add check definitions instruction.
Clean up.