More work in LiftToToplevel clientModule