Use generic head links instead of ad-hoc mechanisms