block: Stop using macro stubs for the data integrity code (updated)