Ongoing work on the console(7) refactoring.