Updating: minor.
Updating: handling local template implementations.