Improved the previous fix

Realized that, if I add contextBundlesAndContexts, that essentially
obsoletes applyToIncomingProps with a better solution.  It's now clearer
how to replace the existing calls.