Try to remove favorite file as directory if removal as file fails.

Also, always remove favoriteness when requested, regardless of success
in removal of file contents.

Removal as directory provides for residue from the bug that this branch
addresses.