S'more small non-functional changes in comments and #includes.