server/: Post-merge fixup.