Cleanup to reduce diffs from upstream