Additional changes per Andy's review.