Changed how macro parameters are extracted