With this little tweak, I should have a clean build.  There
are only 2 errors left.