Again, minor adjustments before merging a branch.