rearranged strict/warnings equivalents so that we don't need to add the same stuff to two places and also that we can test them mor eeasily