strict checks where applicable

and shorten/remove misleading checks where strict cannot be applied.