Make the Lemur linking support slightly more general.