Remove some uses of partial head