Clean up a bunch of cruft in --with-ssl; make it more resemble other