Expand the use of the new completion message formatting system.