Fix potential "variable-sized object may not be initialized" warnings

Fixes #101
Merge commit 'e900cf2ca662592b674a57e0c325f0389d46b351'