Fix some pylint issues found in F-16
    
    * Using default_attributes rather than what would be defined in output
      is the preferred mechanism for determining what attributes to
      retrieve.
    
    * Replace some add_s() calls with addEntry()