streamlined path assignements, removed merge cruft