OK, here is my fix for issue1635 (aka "rollback ate my commit message!"). Split into two patches because #2 affects output and touches lots of test*.out files. #1 is less controversial and more important. Greg