Do another pass to collect type information