Standardize "block" usage

This commit standardizes on the use of `block` over `blk`. I found the usage of
both in the code, with no real advantage of `blk`.