Refactoring to normalize interfaces a bit.