Also @julienw pointed me to the bug that will need this separation also (probably some refactoring will be needed): https://bugzilla.mozilla.org/show_bug.cgi?id=925404. I'd like to fix this issue next so that we can close this question entirely :)