Make Context an aggregator

Context is now an aggregator (with no user-provided constructor)
so it will be easier to add additional fields to the Context in
the future.