Fix syntax error and update "Dynamically Determining Columns Returned to the Consumer"

[Rageking8]

The trailing spaces in the multiline #defines break the escapes, causing loads of syntax errors. This PR also includes some cleanups.