r15094: Replace ; by # where we have a comment and remove superfluous spaces at