mod_aspire: And some more refactoring