Got rid of all uses of heterogenous equality from SF files

as suggested by Nik