[ cosmetic ] Bloody whole-file n->ns substitution! ep2

We should now have managed to get rid of all the superfluous s