Improved handling of \ucN