8008077: update reference impl for type-annotations

Reviewed-by: jjg
19 files changed