SWC-832 More cleanup code for listParser