if/if let are already handled by block, and keeping these scopes would indent else blocks one level too far.
f24007b30f