was never updated. Also, clean up the macro that caused the warning in the first place (no functional changes, just wrapped and reindented).