Fixed self type in trait WhitespaceExpansion