Fixes linter warnings.

A couple of method signature changes, but the few that aren't private are
obviously very local helper methods (hence unused).