Minor cosmetic changes to the typing rules