Refactored fix for old Clang versions down to one line