Case 2796 - Small optimization and code review.