Revert "Cleanup of various inline comments"

This reverts commit e156314a098fc35b1e5b161862a93df598242e23.