Merge jt - various fixes and improvements
Most important changes: complete drop use of enable_if, count -> contains at some places, some algoritmic simplifications.
Most important changes: complete drop use of enable_if, count -> contains at some places, some algoritmic simplifications.