BUG-5222: Optimize use of declared substatements