Let's use structured initialization and let the compiler do its job.
Fixes CID#1415126.
Fixes more or less: https://bugs.freedesktop.org/show_bug.cgi?id=67474