Minor update: follow-on to kernel refactoring.