Various modules which lacked routines to get at the sub-structures now have them. The tests have been tweaked so they only access internals where essential.