* alloc.c (MARK_STRING, UNMARK_STRING, STRING_MARKED_P): Expand non-union-type versions of XMARK and friends here, because XMARK and friends won't work on an integer field if NO_UNION_TYPE is not defined. (make_number): Define as a function if it's not defined as a macro.