Spacing fixes and a few more BLOCK_META constants.