Corections to (ROOT-6274) can be squashed.