bit more access for maps-vs-null-values
Refactoring to try to (eventually) solve #357; still problematic wrt contextualization, infinite recursion