Fix some trash introduced from improper merging.