Fix usage of "comprise" and "primary".