Data: shave off a couple of bytes

Closes gh-1931