#12 QuotedItemGrouper and refactoring of MainContext