Minor re-org to keep linux happy.