Changes from Russ's code review.