Tweaks to ASSERT macro