Added some const-s.