Code simplification
Merge branch 'master' into yices2