Note: This doesn't solve the upstream import's which still don't comply but it preps CyberChef for it.