Consolidated improvements to python VE handling