SES-1810 : Use ContextStatementCollector as base for StatementCollector

Not deprecating StatementCollector as it is used in so many places, and
could stay in the api indefinitely as it has a useful purpose.