gah, sorry about that.  I copy pasted most of this stuff over from core, looks like I lost all the EOF newlines in the process.