Simplify other checks (#1337)