Applicable statement validation

Non-js validation more consistent with JS validation now.