fixed type:make-... to be thunks