r9672: Fix build for compilers that don't like undefined-length arrays at the end...