Not sure if this improves things, I'm mostly uploading this changeset I had sitting around on my desktop.