Fair point, I see more type-checking errors post-merge - looking!