Event impl supporting changes

... but not both.