Eliminate some extra indirection while referencing itself and Disnix