T S1: reduce occurrences of CONTINUE_MESSAGE