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