Update type_erasure from master.