Merge "Avoid constructing types with errors." into nyc-dev