JAL-3394 Changed most of the token replacement for adding compiler variables