SQL message bus changes:
- Suppress warning
- Move declaration to tighter scope
- Put ++ on its own line in the test