Ah yeah... `resolveTypeAnnotation` is another beast. One of the goals of the umbrella task is to make those two methods as close as possible with incremental changes so that, at some point, we may be able to put them together!     It is expected that it is not the time... yet! :D 