I'll make you both happy: I'll make it both more clear AND remove some state. Commit coming shortly.