Hack and slash to fix bug with comments after properties on the same line. Probably breaks everything except the config options I care about.