Changes to make it easier to handle datablock callbacks.