nm: Minor code cleanup