This sort of changes only make it harder to review.