Move macros into #lang, and fix for mpairs.