[ros-diffs] 01/04: [USETUP] Move some functions around, but no functional code changes otherwise.