It's unfortunate that the legal definition became broader for the same reason I think the common definition shouldn't.

I imagine however that most legislatures get around the issue by having explicit paragraphs establishing harsher punishments for violent rape vs mutually-accepted statutory rape.