Even betterer refactorz.