This would probably be a `Feature` if we carry on with the new Event system.