Remove reliance on PSS_STYLE