Bug 7051 - Refactoring of StmtContextUtils