fix node mapping for callbacks

[marybarker]

I'm closing this without merging in order to open a cleaner alternative for working on the refactor.