For now, I'd say keep everything in the original patch except the
hunk that changes SG_ALL -> 32, revised patch attached.