Move some code (including the optional objects) into libwsutil