Simplify the data API a bit.
Fix return statement.