Added .Type property to all definitions and declarations (sigh!).