CB-8032 - Used typedef for block definition.