This is cleaned up version of fd-avoid-lst-duplicate branch (see !9 (closed)).
fd-avoid-lst-duplicate
Closes #7