g:StmtInputMode improvements