[ros-diffs] [sginsberg] 36022: - Use macro instead of "64" magic