Fix two warnings introduced r201907

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