Big clean up of the relax module.
This was quite messy, and should be good enough for merging once all the FIXMEs are eliminated.
Authored by: bugman 2008-10-16
Parent: [r7753]
Child: [r7755]
