Minor cleanups in SNA code.