Fix On<Something> handlers to actually return data, not some non-existent property.