Minor cleanups to Untaint routines