More filling in of parser code