Minor changes to type defs.