Remove indentation under private and protected methods

We've talked about this change for awhile, but we should really make it before
doing any other major refactoring to make diffs and rebasing a little cleaner.