Patch triple eq and such2 2

This one replaces #453 - shouldn't give any conflict trouble.