Addressing warnings.

 - SI-6923 uncovered a few valid warnings, these have been
   addressed.
 - A pair of "catches all throwable" warnings appeared; one
   of the is spurious and the subject of SI-6994.
Merge pull request #1934 from retronym/ticket/6923-sweep

Addressing warnings.