Cleaned up some PAReview coding standard issues.