I agree with your comment here. It's probably better to return the MVcc entity, then filter it before returning it to the caller.  This was we can still re-use this code internally in other repair stages.