Refactor statement command creation to be more consistent
Fix flay threshold