Comment From: snicoll

@sigee thanks for the PR but we prefer the expressiveness of complete if/else blocks. I wouldn't call the current code having a control flow issue.