Rewrite tokenizer. Fix bug in builder with sub expression