Bug 854982 - Extend functional utils.

Intend is to break up detraitifaction patch into smaller independent changes.