Bug 859372 - Refactor Services.jsm;r=past