[spankwire] Fix extraction and modernize