These changes made it into the repo, so I'm closing this bug.