Minor cleanups to the OPT_DEFINE_DESC macros, don't stringify objects
that are already strings.

Fix a couple of places where words were getting mashed together in a
string.