Apply changes made by B. Gyori in original Clare implementation.
Apply changes made by B. Gyori in original Clare implementation.

Changes were made to the corresponding code in Clare, after this was
split off. This commit applies those changes all at once, adjusting for
subsequent changes on this end, as needed.

sorgerlab/bioagents,bgyori/bioagents