Minor code tweaks while I ponder a problem
Fixing the declaration of the message factory (issues with a circular import)
Turning the MessagesPrivacy class into a couple of adaptors