EMI: Additional conversions from interest/roll to _rot.

This fixes some of the conversions that I missed in PR #999.