More IE8 compat, simplification