More accurate parse results, new bug trailing comma