Some more RAC conversions and tweaks.