Have make_conditional respect automatically_set_content_length

Offshoot of #451 

The change seems logical considering the purported semantics of `automatically_set_content_length`, though I just noticed the oddity reading the code.