Normally the class option applies to the wrapping tag. With this change that option now does different things depending on the `tag` option. I don't think this is a good idea as it makes documenting, testing and comprehending what this method will do given any set of options harder.