Bah.  A couple things got lost in the merge...