Clean up pointer handling to make code more readability. This re-introduces...

Clean up pointer handling to make code more readability.  This re-introduces the compiler optimization problem but this is the correct thing to do.  I will have to drop back from -Os to -O2.