Work on better assert macros