Do we want to leave these debug comments in place (same with line 174)?