move content block link abstraction out into a core helper class. See issue #242