cnf_of_tstp: use type declarations