Vastly simplified code for EL parsing. Moved some generic parts to PGC.