Hi - sorry for slow response.  I saw this in between meetings and was going to ask if someone had merged #384 into this one, since that's where I did that script.  My suggestion is to remove it from this branch and leave #384 open, but the bigger question is whether to also remove the hack I put into #384 to allow Tomek to work on here.  (That hack in the HSM routines is also still here: it converts an assert to a RuntimeError which can be caught at the python level.)  Do we want that hack going onto master?  I'm inclined to think we might, but we should certainly leave the issue open to remind me to make a more reasonable way to handle that bit of code.