Simple code cleanup to reduce merge conflicts in the future.