Some compilation cleanup.