Fix broken follow entity checkboxes (fixes #602)

Refactor watch helper methods a bit in order to be less awkward and more
correct. Above all, this makes the "follow xx" checkboxes in the entity
edit forms actually work deterministically.
remove useless print statements