Updated in 23ab9a6.  A tad lengthier, but I rather like it this way actually.