Refactorings, partial-ing.