Re #10836 Comments and some clean-up for the code