mod_aspire: More refactoring