Merge "Use __typeof__() instead of typeof()"