CFR wrapper must be rewritten

[rcx]

Rewrite procyon too while we're at it. This is just awful.

[rcx]

To be honest, I forget really what was wrong with it. Probably inner classes.