Remove inlinings, slight fix for equality search