Parser remake to support full operator set + normalization