Working TD-3793 (Identify callers for common code.)