Refactor MACHXO2 and add first ELL-i symbols for it