Make 002 and 004 consistent with other implementations