ejc--in-sql-boundaries macros corrected.