Fix unannotated defines with bad number of values