Put back and tweaked `type` checking regex for each `token`