Treat Def::Err correctly in struct patterns Make instantiate_path and instantiate_type a bit closer to each other