Merge pull request #3365 from BonsaiAI/wrap-declarations-in-switch