Minor refactoring to make method signatures more consistant.