More headless refactoring.