Ooverhaul of structure, style, names, comments - no functional change (hope so)
Authored by: tin-pot 2014-02-17
Parent: [r23]
Child: [r25]