Some cleanup on PML module export pass