More performance-related changes.