No real changes, just a small refactoring that will allow reusing the new CommonInit() method in the next commit.