More progress on parsing syntax-rules definitions