Revert "Workaround bugs in check.h assert macros"

This reverts commit ab1d6bd1888bf2d8086c2007ae42da48627b4f13.
Revert "Use <check.h> comparison assert macros"

This reverts commit 2de55b554b9882ec60ab545317941d65372bd047.