Merge "Replace $.type with typeof"