This does not change any behaviour. It's just a preparatory step to make things more clear in the following commits.