Finally fixed some memory errors related to previous change to parsing argument lists.