Update to work with latest NQP.