Minor simplification of parser.
Add source index to meta data of lists.