This adds some missing type annotations, and correct some incorrect
ones. Where possible, we remove duplication by using resolvers to
provide field options.