Clean up of key block functions

No substantial new code, just making the old code consistent.

Review URL: http://codereview.chromium.org/2729021
14 files changed