Styling tweaks
Remove over complicated clause generation in favour of zope record
marshalling.