Relative require tweaks, round 2.