Break out each check for better output granularity

Fixes #70