Update macaw to 1.5.8

Same for this one.