Replace unneeded check-within with check-expect