Slight refactoring or method signatures to be more consistent.