Move the body-shape predicate into RichBody so admission no longer mirrors decode slots. C2C control stays a header check.