Beasted the refactoring, again.