Fix warnings: -Wduplicate-decl-specifier, -Wmissing-field-initializers

This silences compile-time warnings with clang 3.4.