Switch to using messages only, with <messages and >messages replacing messages and events, respectively.