Fixed #656: AgaviToolkit::expandVariables replacing is too greedy