Improved nickname handling.