So it looks like this code actually got bigger since I last read it!?  We need to do a better job here.