Revert 9063b614 + fix leak correctly

9063b614 wasn't really a good fix for the leak from via
getline().  This is more direct and simple.
Update valgrind suppressions