Added support for inline functions, via substitution of expressions