Merge pull request #172 from kjd/optimize-contextj

More efficient resolution of joiner contexts