fix reading too far in lexer
hack to accomodate z3 get-model
CVC4 + Z3 compliance for ADT leaves