Use parts_with_order instead of parts.  Fixes VOV-1958, VOV-2224, and VOV-2225