a tiny bit of genames lookup refactoring. now it only mostly sucks