[oc] Seems like shoulder checking is optional these days