Rephrasing typedef to try to make this work on Travis CI