Simplify logic for content-type/postdata (bug 881241)