Seem to be able to use min context and additional context together now, and exact match mapping restarts as much as it needs to in order to make additional context counting correct.
Finished adding addContext parameter to some of the mapping methods. Did not expect it to take like 5 hours.