This is, and this is the biggest change. I won't be able to get this merged upstream as-is, but it's good enough for our needs.