Add support for named parameters, variables etc... - might require rewriting some of the code generation.