Further simplifications for Chrome vs. Safari