s/data/value/ in a few more places.