dph-lifted-vseg: follow name changes and reinstate some INLINEs