Reorganized step definitions that refer to $ips.