[1.9 only] Updates deprecation information, fixes formatting.