Update for new laziness syntax