derp: Finish cleanup and porting to EDSL.

So, now things work, more or less. Or less.