=str #15755 #15756 source and sink

sorry, deleted the old branch by accident, previous discussion was at #15786 
How much can we trust the stability of super here? Weren't it better to explicitly say "this eq other" and "System.identityHashCode(this)" to avoid surprises if we introduce more levels to the hierarchy?