Hunting down more sources of leaks (empty strings)

Still need to uncomment PPartNP, CountNP