More cleanup from NPMap.Module work