These cleanup avrRos/Ros.* slightly.