Cleanup, more work on metadata transformers.
Refactoring, switched to SSI-style includes.