config: More review fixes and fixed help test.