Eliminate further -Wunused-local-typedef warnings from gcc 4.8