Resolve generic field types more exactly
WIP