Python 2/3 compatibility enhanced.