Rejigging the spa_strdup() calls even more