Even more direct comment edits