Small cleanups to be more consistent with 6.x branch.