More do-not-ignore-the-last-line changes.