It would be good to do the same for `get_raw` above as well for consistency.