Preparing for new Python parsing