OSL emission code, refactor #1.

Modified EDF interface to allow for OSL emission, instead of treating as a special case.