* use more convenient mk_substs function * remove type annotations * use map_bound one level farther outside * style improvements