Switching conventions to "callback" from "cb" in a half-assed way was introducing bugs, go back to "callback"