Fix bug 54956, and cleanup some other things.  Warning reduction.
Fix bug 54956, and cleanup some other things.  Warning reduction.

thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss,thespooler/nss