clean up some type expressions