Take the completion of automount into new helper