Make header lookup more explicit