Move some more comments into the headers