If I remember correctly, the `if` block was added because `mypy` "wouldn't shut up" about these values being `Optional[str]` and not `str` which if course was the result of me using the `get` method that returns `None` as default value.  Based on your previous change request, I think think this `if` block might not be needed anyway.