Some tiny changes to the source code to make future diffs smaller