Fix for locking issues in redmine/6334

I'd rather it were `{ "first", "second" }`, so that `"pass_$(pass_strings)_$(activations)"` doesn't have a dot in it; you'd, naturally, have to change the uses of `$($(activations))` to `$(test.$(activations))`, but I think that'd be clearer anyway.