[PLAT-6533] Tidy up visitors in interestrate

Reviewed by Ian.