Simplify checks in 3e63057