right, but the tests for whether we are generating PDF are a bit more
readable, and some unnecessary indirection has been removed.