Add preparation for provider (bug 942361)

I've been trying to keep JS lines under 80 to allow multiple Vim splits :)