Cleaned up some code, still tracking down NIZK errors.