Fixed #5274 (TokenList: macro handling)