Fix unused typedefs, misplaced default arg exposed by GCC 4.9.2.