Futher tweaks to refactor branch

A continuation of https://github.com/scottjehl/picturefill/pull/126.