Preview functionality cleanup

Ah, but that wouldn't be backward compatible if we made `content` a keyword argument.