Removes dead code (by Vlad Losev).  Fixes tr1 tuple's path on gcc version before 4.0.0 (by Zhanyong Wan).