a bit shorter lines, re #10335