Also annotate the context to expressions and types