Tidying up HctLinkage