Hi Jason.

Attached is a new patch with the off-list corrections.

Tested on x86_64 Linux.

Aldy