Moved state computation to before updates are notified, see #207