Replaced more old SigChunk programming patterns