Improve constness