Various code review changes.