Another couple refactorings...