Let M-q DTRT (no need for C-c M-q)