Minor constless improvements.