Quite a lot happier with things now - the mass of record types annoys me still though... create an issue. No regression.
Merge pull request #11 from saxonmatt/InternalRefactoring

Quite a lot happier with things now - the mass of record types annoys me...