Resolution of conflicts that slipped through, post-refactoring
Merge branch 'alteredimplicits' of https://github.com/bitonic/tog into alteredimplicits
Some refactoring after I mistakenly thought checkHiding was the cause of an infinite loop.