Cosmetical changes, so that there are fewer code differences