Make a few NodeHelpers more general.