Clean up expression building logic. Now all multi-character operators are discovered before single-character operators.