Yes, I pulled it out as a separate PR.  I can rebase if the other one gets added.