- Initial attempt at allowing macro parameters in context
- Macro parameters are now in context