Judicious re-merge after Eric McCann's re-fixening.