Fixed things up for 5.8.8, hopefully 5.10 as well.