Make change events optional

See #657