Port the rest of plugins to new code style..