Make statements uniform for TRQ-2561.