Some more little tweaks related to the switch to being a wycc plugin.