Fix Trac #3261: make default types play nice with -Werror