Cleanup after 1.9-maint -> 2.0-maint merge.