Micro-optimizations to increase time to import units by 30%.

I noticed that importing anything that uses units was taking ~1s on my machine.  Not crazy long, but enough to notice -- this decreases that time by about 30%.  There still might be more to be done...