Fiddling with imports
Correcting previous commit...
Throwing out unused counter of evil

I thought I got rid of this in '5b42df6'....
Using the `Handlers` where applicable in the compiler
WIP