Preservation of configuration settings are now supported.  This is due
to the comments being moved to the header.
Whitespacing chaos.