Fix dump -w/-W output, again...