[canalplus] Tweak extractor to support piwiplus (Closes #4046)