Remove some duplicate code, simplify

The `this_csr_is_for_the_current_host` method appeared twice (apparently a
merge error), and produced more confusion than was removed by factoring
it out of the `generate_certificate_request` method, since "this" in this
case is a host, not a CSR.

Hopefully a simple enough change to merge without a bug, but I can open one if desired.