More fixes for old-style senders.

Correctly differentiate between old and new styles
Make sure to clear sender fragments before remaking them
as we are caching models.
Change-Id: Iba3e5c86760744b912c5aa94131b2f5aa3feed04
2 files changed