If productions
Removed an unnecessary variable
lexical.l cleanup
Added support for inlined expressions