Improve long and unicode consistency.