Ah. Ok then. I spent another few minutes with it after I posted that and made it a little nicer, but not particularly faster: http://pastie.org/2202963

May want to use that instead.