Tightening up calls migration logic.