Fold in Alf's unlinking + dlopen changes