This is version 2 of the "random C++-ification" series. This one addresses Pedro's review comments. I regtested this again on x86-64 Fedora 24. I'm checking it in. Tom