Fix merge fallout

This brings things in line with upstream.