Clean up and [dodgy] token quantifier