Address issues raised in Joe B. code review.