some pyincref cleanups