Type annotation should take advantage of recursive annotation checking Reviewed-by: jjg
Reviewed-by: darcy
Reviewed-by: jjg