HV-834 Allowing for curly braces within EL expressions.

To do this I needed to explicitly track whether a expression is a parameter or EL expression