#19: Moved byte to int for all blocks.