Change data api slightly to be more explicit.

- data and data(value) is easy to mess up.