Don't use tag-based init; gcc v9 doesn't like it.

Don't use tag-based init; gcc v9 doesn't like it. #581