Some minor lookup refactoring.