Use wrap-rewrites from lib-noir