Minor cleanup; moving this to nom