While there, buildlink2-ify. Changes suggested by Joachim Koenig-Baltes <joachim@cms.tecmath.com> in private e-mail.