More refinement in pre-duplication flag mangling

Closes #33