Fix recursive call
Made navajo.config.emitter not-immediate.
Immediate seemed to deadlock DS somehow (only seen in Eclipse+Equinox, Felix/Karaf might be different)

Also clean up some code