Adjusted the new typing context to match the modifications made to the old one.