Improving error-checking macros using Jed Brown's suggestions.