Make some type definitions more explicit