Update to modern self-relatively.