Move from assert to better assert because it's, well, better
Fix code for better-assert