Fix nasty merge gunk.