MONDRIAN-1569: Some changes after code review.