Fix token stream
Finish minifier