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