First round of Python level changes