A lot in this patch is not alphabetically ordered.