Cockpen church, Dalhousie, McGonagall and Rundkvist