Refactoring the CoronetContext a bit.