Hi Stefan and group,

I have broken my previous submission of the patch into two parts, the first cosmetic, and the second function. This should make it easier to discuss the functional changes.

Best regards, Larry