[statement] fix various issues#12

pchampin merged 5 commits intomainw3c-cg/r2c2:mainfrom

statement_fix_various_issuesw3c-cg/r2c2:statement_fix_various_issuesCopy head branch name to clipboard