Reduced unnecessary name fetching.