Apply extra vars after all other vars have been merged in a play

Fixes #6677