That's it. Then it builds on bleeding-edge arch without issue. Darrell, will you try this patch and confirm that it works fine with python2. Then let's get a few more eyes on it and if no objections, push it. The patch is included below.