Add new contexts, add define for switching between nonleaf partial
eviction strategies