This results in an enormous number of changes but it makes the code more
consistent and, hopefully, easier to read/understand.  The code statements
have been mostly left untouched, the libraries compile and all tests that
do not require access to a device were successful.