Last call for comments. Will merge this in by 10/9 if there's no new comment before then.