So, I should replace the returns with ASSERT(False)?