Cleanup method signatures.

BUG=
R=jmesserly@google.com

Review URL: https://codereview.appspot.com/198060043
4 files changed