On further inspection, it turns out that the commit isn't quite right; it does not contain all the expected fixes. I'll dive in to figure out why that is. Apologies for the line noise.