Improved performance of isPhone and isTablet.