[ros-diffs] [gedmurphy] 44957: Make the logic easier to read