SWC-832 Cleanup code for the listParser