Replaced token_vector macros with concrete implementations.
Replaced vector_t macros with concrete functions.