Tiny changes that improve compiler compatibility.