Jay: Checkin before getting rid of accessors.