...user_description= is interpreted now would cause SUFs to break. Fix two wacky macros that caused false positives on this test in mainline.