Some cosmetic changes

 - Factor out type() and parameterCount(), mostly to save a few method dispatches,
in spread default augmentation

 - forgotten a space between method declaration and begin block curved brace