Yeah, I just copy+pasted the old code.  I'll clean it up a bit.