More noise->libnoise fixes.