Fixed parser so it can handle explicit lists.