Fix substitute() to indicate final var's names.
Remove subsituteOld()