Some const updates.