Yea...  I was getting assert happy there.  I'll fix it a little later so we can merge this.