Update 8.3-compat diff file.
Get tests passing on 8.3.