lifting: Refactor + port proper NBar to product lines