Bug 1008199 - Factor out unneeded dependencies in functional.js