Markup is now wrapped with the appropriate <div>s.