Tweaks to edge cases of 'RelativeTo'