Use expect* methods more + some cleanup#314

Merged

mtdowling merged 1 commit into0.10from use-more-expect

Mar 16, 2020

+636-180

Commits on Mar 14, 2020

Add and use expect* methods more + some cleanup
mtdowling
committed