More tweaks to Provider.Lifter