PIG-4880: Overlapping of parameter substitution names inside&outside a macro fails with NPE (knoguchi)