Incorporating Sean Weaver's fixes to programming cryptol - ticket #80