More work on type resolver, adding resolved types.