Some null-relative refactor