Also improves factorization in browser providers
mentioned in issue #971 (closed)
mentioned in commit 8b7a555d