Remove tagged struct init

For some reason, Travis CI's gcc doesn't like tagged structure init in
cpp files.