Remove some more tainting problems.