More work on liftToToplevel. Need to bring companion declarations along.