Merge pull request #12 from cgay/simplify

Simplify
Merge pull request #13 from cgay/simplify

Get rid of half the 'Warning: Condition of class <test-warning> occurred...
Merge pull request #14 from cgay/simplify

Prevent warnings on stderr when <test-warning> is signaled during tests.
Code movement.  No functional changes.