They are both pretty ugly.  I think I actually prefer the current code to that, but only slightly.