Yea for sure -- sounds like a good cleanup CL for later. Remind me again: why do we need two different classes for this?