Fire change events right away if we're not in a nested scenario. Fixes #427