Updated to match refactored pycompilation