Simplified lookups a bit.