Minor code cleanup; tagged output statements with [xwl] so I know where they're coming from.