Minor cleanup from lessons learned in another prototype.