Preliminary work-around to only substitute by any/empty variables that were introduced by the tallying.