Some more cleanups for pm.c