- Removed lvalue const-cast.
- Removed unused variable.