Merge: stop pulling in all of Firefox's build-deps. Fix bug 946461.
Fix overlapping refs for calls to operator() or operator[].