slightly more tolerant Trace_tstp.of_decls
Merge branch 'dev' into common_term