Making changes for compatibility with new WALA versions