Handle one more bare if-else scenario

Fixes #450