Add [subst] that peeks through hnfs