Tightened up some of the types in the header