More comments changed - and commented-out an unreachable code warning suppression - believed not now needed.