Move prep_jid into the returner interface