Oy, just squashed a really nasty, tricky subtle bug. Feels good but took waaay too long.