Switch to struct initialization supported by gcc