simplify make-repeatable, use it more