Take existing shims and add direct equality comparison. Remove shims.