simplify simple/triple statement validation
Merge branch 'experimental'