BUG-7052: reduce StatementContextBase proliferation even more