Merge "General cleanup in segmentation-related code."