More ok/is checks, let's improve where possible.