Merge "Fix build: __unused isn't unused!"