BUG-5222: Reuse substatements across phases