Added a TODO item for substitutions.