Regression: own 'init' not getting called.

Sorry, my previous changes broke stuff. Here are some failing unit tests. I will work on a fix.