Eliminate two more unnecessary blocks.