A couple of tweaks to the previous patch, from Darin's review.