[#13] General cleanup of Link(s)/Builder classes