Gernot's code review inspired improvements.