What that dangling "True" is for is kind of obscure. Can you make it a kwarg (even though you don't really need to - just so it's clear what the True/False means in these calls?) or make a comment? I guess, it's just kind of hard to read through this code, I've been doing this review with the code open in 3 different windows to do massive amounts of cross-referencing.