Fix type of resubmit args.  Cleanup pylint warnings.  #4198.