generalize %setup parsing to support more %setup options

fix cases where we were deleting multiple other options to %setup