Minor front refactoring.