Merge "Second clean-up pass after support-v4 split."