Update data offset format and warn about the previous one.

Also update the macro to select a bdev.
Also reindent.