Test suite/codebase cleanups

No significant changes except major cleanups that I need to work with the static inspections.

Depends on andrew-kandels/contain#20