Eh, I got super class-happy.  :)  Fixing.