Minor simplifications of Builder::Context
Specs for Builder::Context have been written