Merge "Remove old asserts that don't compile with NDEBUG" into main