Bit of groundwork for (possibly?) implementing #224; contextualization isolated in one place