These changes make the code compile and work with Nim 2.0rc1.
Ok, here is finally what I had in mind ;)
GULPF
