Some cleanup after the last merges.