Adding contributes from first PEP review round.