First pass at regularizing crab2 resubmission stuff