Improve blocks to mimic Ruby style.