minor comment and order fixup, no functions changes
minor reworking to get code to compile cleanly under older gcc compiler, update nsassert calls to accept static string with arguments