Bug 831933: Correct indentation and fix consistency issues from review.