Ingo's nitpicks fixed (fix-up in 2/4)