Fix two warnings introduced r201907

Unused variable is removed.  Construction order is changed to match 
declaration order.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201914 91177308-0d34-0410-b5e6-96231b3b80d8