Coding standards change and redundent isset removal.  #1533