Fixed compilation without libkface. Implemented handling of already-associated proposed tags. Code cleanup.