more spring cleaning of nr.c and nrutil.h