Completed replacing old assert(boolean) with new assert(boolean) that uses macro.