8008077: update reference impl for type-annotationsReviewed-by: jjgContributed-by: wmdietl@cs.washington.edu