Reverting to old-style typedef, due to g++ issue.

Not clear whether g++ supports the type alias syntax.
Problem on travis might be due to version of g++.