Use C preprocessor macros for configuration parameter strings, to avoid problems from typos, 
etc.

Changes are in

r21871, r21872, r21873, r21879, r21880