Amend previous commit with similar changes.