Simplify a few more branches to improve coverage (#500)

3 files changed