[BUGFIX] Plugin initialisers should be run in the context of the plugin class
[CS] Cleanup block passing to be more explicit

Don't rely on weird ruby edge-case behaviour