Refactor is_blah types to make less buggy and more obvious