Some cleanup of P92->P95