minor simplifications to SMT encoding