Be more explicit about what we are checking

(This removes a crap ton of clang warnings)