[rt3/f17: 5/5] Merge cleanup.