refactor mk_* and treq.* calls into re-usable things